Merge branch 'text_edits'

Conflicts:
	mission.html
